Backout e6bda3437a7c for OSX bustage.