(bug 73389) rollback new controller modules due to mobile fail

Change-Id: I337057fd75a7790848d8aa85b2243355f17c48f2