Revert "Switching to ZeroBanner/Portal extension, disabling ZRMA"

This reverts commit 08afc4c4aa3a65591b75d76b100eea2d7654c4d4.

Change-Id: I366eb58cec6406c5abf7c5f0d04832b7379b8f5d