It should have been committed in 0a6b0e62d8