Was this moved in core.py just for better visibility?