Revert 98de0df..d4fc7ee

This rolls back to commit 98de0df326d6dab4c481e3ecd8d4ef6897496971.