Fixed by reverting incorrect fix of MDEC-7055 (reopened) and removing the
test case (because it now crashes).