Revert 2c098a8..d8dc932

This rolls back to commit 2c098a873ea7be7e5d577bc38fa6e471dd07dd6e.