Revert "Enough of stub, die plz"

This reverts commit b41b4ce4e420f0ff938ce158ce44349c5ca1a31e.