Revert part of 47209. Hope this time is the good one