Revert "Revert "Remove accidental early return""

This reverts commit 329f1f4a.

Reason for revert: This one should be safe to submit without being blocked by the others and it fixes a logical error.

Change-Id: Id08cf1a5aa890b604ff4a77c02515e277f2241e0