Revert change from PR #1293

This should have happened when 7e89350951aa6d was merged in