revert part of commit add0211522737b79dad990ccd65c8af63b5cc1dd