Revert "comments"

This reverts commit 9026c77a07533bda3773c3c3f3df1c6592bc80c7.
Revert "Implement shortcuts for slow calls that would require PAPs (#6084)"

This reverts commit 2f5db98e90cf0cff1a11971c85f108a7480528ed.