Remove race condition regression re #276