LPS-38165 Revert as it is breaking the build
LPS-33227 Remove wrong property