Revert "m7-common: code cleanup"

This reverts commit 770281bec21bfd2cebd5dc0fa4d76081e69e2e7a.