Removed hack in blueprint controller in favor of more complete fix moving into ORM.