Revert 01435cf..9969d9a

This rolls back to commit 01435cf2ce744cf04efccaa2c0fea86b3369fe03.