Better fix for 5.3.3 segfaults

- Added `@return` annotations to data providers and test cases that exhibited
  behavior
- Reverts bd2c6f4afb and 817aeb1ee