The changes in 5152 appear to have introduced a performance problem on stage, so we're going to revert them for now.
