This reverts commit 8173040ea6. Since it didn't provide any real benefit after talking with sgallagh, it seems like we'd better off not introduce more risk to the next deployment.
8173040ea6