revert to b4c48a1
restore and clean M7