Revert #3747

#3747 caused LMS-11464, and since it didn't add any tests, it's too risky to go into the release.