Reset to experimental and apply simpler patch