PLA-1806 some changes reverted