customizing with PR#4583 and removing addClass/removeClass