This conflicts with #831. Will follow up