Remove workaround that was hard to uplift.
Merge pull request #889 from Gozala/bug/remove-method-workaround@839746

Bug 839746 - Remove workaround that was hard to uplift. r=@zer0