Revert d8772dd..95841cb

This rolls back to commit d8772dde5c776a753c69d37b0f3da207cf43b882.
Revert ae4a2d5..b54fa43

This rolls back to commit ae4a2d52f74cd2ee13859ae89b9246307fd198a0.