PLA-460 revert unwanted change