Add missing changes from previous command fix commit.