PAHMA-843: Removed PAHMA-943 code

Branch was contaminated with PAHMA-943 code.