[2.6 patch] schedule SHAPER for removal