Revert 057d6e7..c821c1a

This rolls back to commit 057d6e7ed74acf411ca43c714e388445eb3041b2.