This reverts commit 23f18649. The bug has now been fixed, so we can go back to managing this ourselves.