Reverted changes of parsing %00 correctly because it introduced another bug