This is the Linux equivalent of 3731a2ff0. There's probably a way to merge them into one file cleanly, but the extra linker args on OS X make it a little tricky. I'm deciding not to worry about it right now.
3731a2ff0