Revert "Convert Controller to a full service"

This reverts commit 0e6d972641c19467d6b26351ce14a3f44c9fd6f4.

(It's a clean revert.  Submitting for mblank, who had troubles with
repo.)

Change-Id: I843169f5dc3aff528c249035b3413b56ca552923
1 file changed