Revert "Merge branch 'questionmarks'" (unfinished)