Reverting 63764f9a0f4806e36bfda7e6e4555fa42cb1ef79 (we still want to depend on CMFController)