Backout bug 924893 for smoketest bustage