Switch back to the 'current' frame

master -> merge
v1-train -> not tested

Switch back to the 'current' frame once bug 855327 is resolved 
https://bugzilla.mozilla.org/show_bug.cgi?id=855327