comment #3 patch d7 port
