Revert commit 122654 at the request of Chris, who reckons that instsimplify