Revert "Merge branch 'PrototypeShield'"

This reverts commit 54b4e4dc09a25f90b0a5f5c5c37bc8a9251ddd9a.