This reverts commit 22ad44d6a9. With the MIB service implemented, this hack is no longer necessary. Change-Id: Ic969c2dcecd6fc9ce283d1dda6518796869875e3
22ad44d6a9