Rebuilt module using block_submit and some extra work to make that extensible. See issue #1814332 for some details.
