SkipCR revert
Hopefully working