Reverted PRSDK-927 implementation due to build