Revert "Make sure we access main and stubs consistently"

This reverts commit 7b9543124a4d461c74c5b15291a1234336ec3863.