partial Revert "questionable methods"

This reverts commit 0f73a30dc400873fa80adeac8019c666dbe2fc82.