This is no longer necessary following e7e5836