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