Revert "Import of Version 1.1.0"

This reverts commit d7286ce81a5e334038df772794677c5e947013f6.