This reverts commit e8eff9fb9c2fa6fc518404c2f9b731f8c28d3a23. OS X compiler gets confused by this change.