I'm going to keep this in here though to minimize the risk of this hotfix. We can pull it out later.