This reverts commit 755a8959. Although I was not able to reproduce any test failures locally, aheejin was able to reproduce them and found a fix, applied here.