This reverts commit 6dff63294a. We have a more general fix now, so don't need this any more.
6dff63294a