MDL-22609 fixed regression in my previous commit, sorry