Bug 912090 - Switch to a tag while CAF deals with crazy bots

Change-Id: I62ea7177fcfb17ffb3608c7c143d7c484c2e1ded