This partially reverts commit 7d855bb8. The comments were actually not outdated, they were simply unclear. (cherry picked from commit cf08452e)