Revert fix regression since #140