Minor revert because of API change.