MID-954 fix attempt.