Revert the recent fixes until 1-2-2 is branched