Revert "Merge branch 'tracking-af-com.todobom.opennotescanner' into 'master'"

This reverts merge request !6421 (merged) I've been mistaken, sorry. See #1920 (closed) for details.