update messed up LF from upstream merge