Revert 4df8cc2..af33d4b

This rolls back to commit 4df8cc23a6d7479d24585df68955a5bd30977a96.
Revert c7d38a0..503b5c2

This rolls back to commit c7d38a074c60824bda916d6c8c9876e1e631b991.