CSPACE-347: Once again undoing changes made in previous commit. Those changes should be made on a different branch. yuk.