Revert "memctrl 3.1"

This reverts commit b5537b291400fbe11b8cc8a9c63dbcd8d02ce5de.