Revert 1e603bd..8a888f8

This rolls back to commit 1e603bd98242dced266d18d2002d382fef18eaf6.