This reverts commit 9a70ca78a5, reversing changes made to efd5b9abbd. Hopefully fixes EDUCATOR-3053
9a70ca78a5
efd5b9abbd