Bug 1069369 - Remove all manual discarding during frame lookup. r=tn a=kwierso

--HG--
extra : amend_source : 1e5092aafae1404a816a41b258c307ebfcb1e8bc