Fix for botched cherry-pick commit 60fb230.