This reverts commit 5c97aa1a. Reason for revert: Breaking PDX bufferhubd Change-Id: I98d1e81a0663d537d325177dbe139c1e97ccb8c8