This reverts commit a8a9c8e0. There are multiple reported failures caused by this change. Each failure is really weird, but it makes sense to revert while investigating.