Revert "Remove unnecessary return"

This reverts commit 3053ded760a9657bdc7b935beb61d2f632859928.
6 files changed