Revert to bc0e5fd82912046cde6e71bd4980574e214ee482