Reverting commits to 1.2.3 due to bad merge