this is a followup of !427 (merged)
This will create a new commit in order to revert the existing changes.