Rollback for async. Small timing issue caused a bug.

Need to investigate more before setting live.