Revert 1a1fc94..662333d

This rolls back to commit 1a1fc94ebc169271d9631cadfdcb0db2e9255a3e.
Revert c3a33e2..ddad92a

This rolls back to commit c3a33e2cc407a828712a9cc7ed2e3685d92847b8.