More reversions to previous style