Remove some premature changes
(cherry picked from commit d7950a1)