This change probably should have been committed quite some time ago :D