Backed out changeset f97f196dcb58 - bug 480301 needs more work