Revert "XPathParser: better parse complex paths"

This reverts commit 9a0ccb0474608165032cfa34e99234fadad170eb.