Revert to timer-based approach for now.