Backout f3c145bd1dd2 & 5075690572a9 for OS X startup failures