Let's not get ahead of ourselves and change these functions, please revert these back.