Revert to dfb8770e6a