Revert "Uniform return value."

This reverts commit df7c46391863bd2e3e7022ce20f8e3460f77172a.