Redo should now obey the masks it had when it was originally applied.

It's far from perfect and we should probably mask the actual block list instead.
Merge branch 'redomasks-old' into develop