Revert to d3d487e28b5dedc095df1beee312b30df102df3f