Revert to 8227aeab97828f988dffb38f9a0a72344c6ec422