revert to original style of branch auto614