Revert to 910d8f3431ff9a6bd7a805fca62d52b24abbe450