Undoing changeset 949 as it breaks the Linux build, per e-mail from John Tsiombikas...