revert back to upstream style (no semicolons etc)