This reverts commit f2ffa33c. My local checkout was behind and Eric already took care of it in the meantime.