Restored reverted fix.