Revert the changes made earlier
Merge branch 'release/v0.9.4.1'