workaround to land #6995