bc6e091004
Because of introduction of `BuilderInference` annotation. Change it back after bootstrap
Because of introduction of `BuilderInference` annotation. Change it back after bootstrap