revert a wrong fix, according to #178