does away with hijacking

/cc @densh