Partially revert 1b54d3f94199

This commit was causing fatal errors because it removes a function
that is referenced elsewhere. Since fatal errors shouldn't exist
in `master`, I'm (partially) reverting this for now.