This was only for the MAC and I've been told it doesn't compile. I will research later. This reverts commit 142727dd.