SSP-1662 - rolled back change to this file which was part of a merge but
was for another issue not intended to be merged into this branch