Revert ef42ce0..4d6c99e

This rolls back to commit ef42ce031913810542566f928d84e26e2f7850c5.