Revert "commit bmm4"

This reverts commit bab57241d9299bff8a32394cfec6577df7c3fb78.