Revert "more stubbing"

This reverts commit ef1b4421a8e0ac59c8e9b0cfd8c8cec1e1b8b506.