revert abstract inline changes (problems with Vector on flash)