remove crazy stuff added by revert of 3708d886958258fcf18fe827eb8ab32ecda45943