OK. I guess I'll revert the change here and everything will be better once we merge both branches into master.