Manual revert to a4cb932