Revert "Implement the first proposed fix in PLCR-521; we'll be rolling this back."

This reverts commit 09b1a1a1f20710015d4378b99e801209c2e7e119.

Issue: PLCR-521