Revert PLFM-1509 due to failed integration tests