[MAT-426] fix up bad rebase.