R1:73cce6e1310b

Revert "Promote phutil-tag again"

This reverts commit 8fbabdc06d9c951e92e21ab491740740322bff6d, reversing
changes made to 2dab1c1e42f25b889909146ba6f5286c7cc6bc75.