This shouldn't have been included in this diff. It's something that's broken in debug builds on OSX that I haven't figured out yet.