Revert "a little bit of bypass surgery"

This reverts commit 20cfbeb3e1781d6d93f482e08d122e7f9aaea655.