Revert "Fixed/Improved return on two functions"

This reverts commit dfe8d935df72d218324db39bd37fa2ffadf27aa2.