Revert cf7f0ff..4019e2b

This rolls back to commit cf7f0fffc02e0f9cfc2c68d73d08df32dd162494.
Revert 4019e2b..521f15d

This rolls back to commit 4019e2be93ffd5a9f46d3b21e86d0df87b6b73c8.