See above agreement that this should be replaced w/ the generic xblock mechanism