[WTF] breaking changes reverted