Revert "0.6.1 > 0.6.2"

This reverts commit 05d7d907058ef1a267196a3b19f70c59dda4d91f.
Revert "Revert "0.6.1 > 0.6.2""

This reverts commit 09746804430ecabbff1cce04fc46dd3313bf1015.
remove erronous added files in previous commit