Revert #3194

This has caused way too many BC breaks (#3238, #3242, #3257).
Close #3257