Backport of MONDRIAN-1390 from commit 791b419295478fe4c127d34a0735c68107c85c69 in branch master.
Reverts commit fb07884c41255bacbb02c69d5ad2ef398e16c87c from this branch. It shouldn't have been merged here.