Revert "PCL Compatibility modifications thus far"

This reverts commit 841e74eebafa2b9f261d8abd2d720a63994e9afd.