Revert some shared code until Catia/Claudia are updated