Revert "taking a simpler approach"

This reverts commit 98bbb384212b472da7ff0ee96b3c56d471b44726.