Revert bad change introduced in v1.0.2