MDL-24329 reverting previous patch, it should be imo better to not should discouraged...