port 19f6c5da8... to faq.md

While there, remove a TODO leftover.