Revert "Fix for DAWNSCI-876"

This reverts commit 1a380cba750a8a25ab6d3c560bad619bfc941f87.