Issue #147: Removing redundant failsafe.