Follow up cleanup after #3110
Follow up cleanup after #3110