This is a follow-up of the already-merged !1334 (merged) .
This will create a new commit in order to revert the existing changes.
