Revert to e673331aa3