Revert bfb986a..777e350

This rolls back to commit bfb986a12f73682499661e3f781f199d4df01c9e.