Revert 65bf8eb..8933090

This rolls back to commit 65bf8eb74b9e96db3413bea326c68e4aa82545ed.
Revert 8933090..1122ab7

This rolls back to commit 89330907708425b65c83b8c9661a4afdf23a3433.