do not revert the round-robin patch 1bcfd29