Revert "Merge pull request #9288 from fcampo/RemainingPinIntents-system"

This reverts commit e5b866b2c0118a00319ced69c8adfd158fdc158f, reversing
changes made to 0cd9bc4755307186d2b05e11d93c463d532d604f.