[BUGFIX] Broken inheritance type handling in FlowAnnotationDriver
This reverts commit 93fbe9fc8d789547f05eec2b4945eb6c565fa3fa because
it broke more than it was supposed to fix.
The failing test that led to the original "fix" was in fact broken and
is fixed with this change.