Revert fdd11c5..8c1940d

This rolls back to commit fdd11c5e43f449700a00f2e0e61941d4807e13c1.