Reverted changes from 1.1.
1.2.0