fix fallout caused by people mixing style and feature changes