Revert "-Fixed bug with multiblock subtype matching"

This reverts commit db71cba21bcee9607fb7274934ed4d66cab1a9a4.