Revert "Need to get the MD5 to recompute after we encrypt"

This reverts commit 3db82b1b20901b0362e8a1367328f9c5c63e021f.
Going back to the inheritance route.
Should be the most ninja, least disruptive.