Revert "Merge branch 'patch-2' into my-tuning"

This reverts commit ee66f7e5881510040cc8ed13c2074c5fce5e591d, reversing
changes made to 0e89a46ce06d54e201222a061bfca3e5b6fadf1b.