Revert "Remove unnecessary return"

This reverts commit 843d2506e1a1eab17b871bc38b204d27047c9ff7.
8 files changed