Essentially !1878 (closed), fixed up. I want to get this reviewed and merged, we could have already used it for EmojiReacts and it will be useful down the road.