Reverted breaking change