Put entity in own variable for easier change
Now loads the entity manually to reflect changes in Commerce 1.6 and 1.7.