fixup changes from commit f63ca950