requested frolic polish (bug 823984)