Revert change made in v1.2.0