CSPACE-4928: Back out unused, experimental changes.