Revert cf42722..8cf1db9

This rolls back to commit cf4272266ec4f1e9c95206b557dd1101ca4e15c8.