Revert change meant to help in multi-user environments.