Fixes !943 (merged)
Steps to reproduce:
Steps to validate that it works:
This will create a new commit in order to revert the existing changes.
