refs #2705: Caffeine alert! Rolled back wrongdoings