Firefox work-around seems to be no longer required