Revert 947b7f8..d918135

This rolls back to commit 947b7f8b18b3c0a340569d291e9f040f90d19baa.