remove dependencies on line_extension
Revert "remove dependencies on line_extension"

This reverts commit 31b05c6e62e3a430b33370fae4cd13d947d22bbf.
Merge branch 'master' into replace_ule