Bug 899367 - Followup bustage fix for some functions that were renamed out from under me. r=me CLOSED TREE