revert from hacky modkey patch