Revert "Port Peek from PA (2/2)"

This reverts commit b642566d4f0471068946577e4065a1c4c190532a.