Mac only: two epoch problem workarounds are no longer needed for GUSI

>= 2.0.5. One still is:-(