Backed out changeset e5defd2af4d5 for causing a regression. rs=bustage-fix