Closes #2142 (closed)
Above !705 (merged) and !706 (merged).
This will create a new commit in order to revert the existing changes.