Reverted all changes since 1.2.0.6