Revert 058a5dd..41b4645

This rolls back to commit 058a5ddfec7702ecac9cd4e51d037c544de47b59.
Revert 23fb227..6ad1644

This rolls back to commit 23fb227aed9beef66629afc11e9b6535571bee89.