In the end, concerning `$ZSH_CUSTOM`, my preference goes to #2653. So yes, you should revert that change, since #2653 deletes the two lines altogether.