Revert "Merge branch '8.30' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-epics.git into 8.30"

This reverts commit 048bd5566e9427258e5f87c3a73dfe49b2b5096e.