These changes can be reverted.