Closes #1584 (closed)
WIP till !2250 (merged) got merged.
This will create a new commit in order to revert the existing changes.
