Revert 5f98c29..c4de3ea

This rolls back to commit 5f98c2974c710fd97b5f2497dc1e4607a6243ae1.