Get rid of nextTick

cc @narqo @veged