Going back to previous waiting loop implementation.