Tweak for MDL-36499 if solution applied.