EPG-34244 - reverting the changes