Reverted 1.1 features