Backed out changeset 169e19d13daa (bug 903456) for S4 bustage