[configure] Revert changes that will be applied with the patch