Should include this in #591.