Merge pull request #3232 from phire/minor-cleanup Just a minor cleanup. Totally not the cause of random FifoCi failures.
