Revert 238f225..e7e6693

This rolls back to commit 238f225854b25d27373a28edec34a23a8e45e800.