Revert to 79339570480ed9513192a34cabd5c6befc39a940