Remove P4 option without using a patch