Reverting to c6ffdae