Revert "Don't force MemoryBlocks on classes that don't care."

This reverts commit 9f39554d91462f0730bacedec7a18fa7c0fd75c3.