[RTL] Revert b3b2a23 which introduced a regression.