Restore #3912 and #3825. Use intrinsic expression instead of intrinsic module. This reverts commit 347d82b8.
mentioned in commit d78efeff