No binary

No binary. Cherry pick. Quick and clean.