Copied to mac, committed as a workaround