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

How did this get onto jb43?

This reverts commit d98e9654df46c0a0657e2485d8f4d95bc3c981d6.

Change-Id: I52109b0a49ac686ea8adc58a017d513af7c2ffb1