7416805a44
This reverts commit 582b70f9c3.
Conflicts:
src/fmm.c
src/perfctr.c
Change-Id: Ib6113c2dd3962c72100c7f74cdef6897e1df40b3