Reversing bad commit

(cherry picked from commit 394fd6e158720e38227ee95db9c45fcc279cec20)