Revert "more hijaxing"

This reverts commit 533e7248ee17c93c7fd65e9585e3377fdeba7c9a.