Removed early return again.