Revert "Merge branch 'better_parsing'"

This reverts commit b3594c9d917d792208b0514c61e539f5c0587669, reversing
changes made to b93318b188d5203e155667ed5a134f5195374291.