Revert to 6982bc0ae40fe9b4b6f29194fed0cde94557f5bc