Reviewed by mbakke@gnu.org

Pushed as 00c1793ce8e2210e48b18422ea3e76da10541874