Revert "can we simplify this?"

This reverts commit 8e6078b773bd0b44597d0e695dce625c1f64f82e.