Revert f77f13b..7ce99d4

This rolls back to commit f77f13bd1f62d3f624dce890934f142f69cb610a.