revert commit 5386 in favor of MTC users