Backout previous two patches because they didn't work