Revert regressions found in 0.18.0

Revert regressions found in 0.18.0 as discussed here: 08265a380d0ff3fce014e98e87bb8c2330858e4a