Merge "Revert "get rid of LinearTransform""