Revert part of 811eab47 due to unintended consequences