Reverted breaking changes