Revert "Void return types"

This reverts commit 38bc05438c9de07d0ae6a887f6ff19a827b5a7a1.