Make bundle anemic, close #1472