Backed out changeset 18f95fb1d866 (bug 948901) for breaking OSX m-oth