Revert "Move upgradeable check to :upgrade action knocking ~10s off each LWRP call."

This reverts commit 2a177af8b51c613041c658c5858776f044d051c5.