Revert "Added the change to wait action that kept the node from crashing"

This reverts commit 6ff4ec93b93911e9a0832d46c0846e781fe0740f.