Revert last commit.  Apparently, the BOT_SUPPORT in this context
is not what it appears.  It should ALWAYS be there, so we need
exactly the opposite for the changes.