Backed out changeset e35851f07b67 (bug 987508) for non-unified bustage.