Committed too much for #234