Revert "temporarily enable the experimental patches, for quilt refresh"