Fixes 01-03-14

Reverts two changes made in past commits that broke edit tests; still some `iFrame` intermittent failures.