Revert "[#1666] fixed regression for 1.2.x version" - wrong branch

This reverts commit a7d753648d2834fc83bae8dc848e25c3b81ea277.