Update to work with cs-studio that removed re-exports