Revert a4f7c54..4de0bec

This rolls back to commit a4f7c5454ab6b61d6816e8f68aa2e7ae2fb44910.
change 2
Merge branch 'Version-2'