This should have been committed a long time ago...