I am going to submit this upstream after doing an "if apple" and testing that.