reverting previous style change until after all releases