Revert 8ff695d..0567614

This rolls back to commit 8ff695dda1caa9560fbbbd1e9b7125c09d6d7a99.