Backing out breaking change