replace any necessary performBlockAndWait with performBlock