Actually, I'd just get rid of this function, see above.