Revert fix regression since #140
Revert fix regression since #140