Corrected return types of some functions
Revert "Corrected return types of some functions"

This reverts commit 6a04aed0d1f61bcf8c5f69e23daadd89263a6c45.