Revert 55d7c48..34d413c

This rolls back to commit 55d7c48d578c21d1690a084b6a30be14cc9fdf7c.
Revert 7ce7a81..dc86eb3

This rolls back to commit 7ce7a81c0494783ed6092271796a301cabfb4a02.