Revert "New NIO mappings"
Query string support seems to have been lost in munge

This reverts commit 7200afc4a117806952c6cd992f31fb5768da08df.