Revert 048b1a5..c16a2f0

This rolls back to commit 048b1a5995ac1c05ac1ac6668aaeb6cd4c6a0977.