This reverts commit dafc113038. This didn't actually fix the problem, so it's been reverted.
dafc113038