Revert "potential fix for #1210"

This reverts commit d5f10f41fd64543c6dbe9d7773f19b5c1dd8ac98.