Revert part of c6d5755, will fix in a branch later