This is no longer necessary - the underlying issue was fixed in 01fa5ee2. This reverts commit d8790428.