This MR continues !1074 (closed) (Ivan's mistake)
This will create a new commit in order to revert the existing changes.