Revert to fa2042c6