Reverting the changes from r1249. The final methods still call the overridden methods in SafeTranslatedCanvas so they are safe to use.