Backed out changeset c732b8ff3869 (bug 852648) for OSX bustage.
DONTBUILD