Revert "FIXES TO v1.1"

This reverts commit d5934a7936058ca79c64eeb021b9427f45927dae.