undo changes that should not be released
0.4.0
re-add sachin's changes