Revert "fixing out of order call"

This reverts commit 270836b528aa836882121caca54d49799959e247.