Reverting breaking change