This reverts commit d9b1c796, reversing changes made to e4c68bdc.
-Deletes the changes done to lane related controllers and restores older implementation