CAAERS-6977 (reverting previous)