Two changes in this request

The second, d58c387, is more controversial than the first. I am certainly open to alternative ways to solve the feedback problem.