merged
mentioned in commit adc522f5
This will create a new commit in order to revert the existing changes.