Revert 8e682de..42d0c54

This rolls back to commit 8e682de10418d05a5b6953f59f784bf30c32736c.