Revert 75db3c6..d957a54

This rolls back to commit 75db3c63fa88d6c7d349dc921922be0780a84ac9.