[MONDRIAN-1729][SP-632]  Rolling back changes from commit 2cdffbe/b99f734 while investigating test failures.