8d800a1b8e
This reverts commit af861e14dc.
Note that MDL-31968 will be in charge of backporting this to stables
if everything goes well under master (once MDL-31968 is tested and closed)