Revert 33b46a2..9631be5

This rolls back to commit 33b46a2270eda37bf63b0030ac8d0b8dccfb3e52.
Revert bd35c39..2402056

This rolls back to commit bd35c3907d4d64b116853f58e7bf3b85cb6a2476.