This was causing significant performance problems in production, and this commit
reverts to the original behavior.