Revert dubious change from GP patch