Considering how Shaco is an extremely difficult champion to learn currently, and also on the same footing, one of the strongest most reliable Junglers when mastered (in solo queue) I highly doubt they will revert any changes made to him. Champions need to have a skill floor where people can use them without needing hundreds of games on the champion to learn how to use him. Having a slightly higher skill floor is fine but with Shaco his whole theme is around stealth and deception which requires an understanding of many things including the ability to use essentially "two champions" at the same time. Also on another note with the way Shaco is now, he has almost no counter play when he has a lead and that's the biggest thing Riot has been punishing with just about every rework.
It's true, Shaco is an extremely satisfying champion to learn (probably even more so to master), the road towards actually becoming good with him is a long and hard road with a lot of frustration. This is something that I believe is not good in any game. You really should only need 15-20 games to learn any champion and it takes a lot longer than that to really learn how to play Shaco.