MDL-21432 restore - also disabled in front page