Revert 44b2d5d..67ac26b

This rolls back to commit 44b2d5d1dea27c89e114dc1680c7756f2b16aacf.