Revert "more detailed parsing"

This reverts commit c2d0471eb4a98f2c4ce2e21462fc0e2e1325c756.