am 2698c5fa: Revert "Move type to general policy."

* commit '2698c5fac1a76863c12e7eb042d81ba27bd26dc7':
  Revert "Move type to general policy."