Revert "Remove ExprBuiltin" (depends on 62a6eeb1f3da0a5954ad2da54c454eb7fc1c6e5d)

This reverts commit d8c061e044a07f7516d76df12bc6920f4f04e5ff.