Added back default-image - it is used, so I shouldn't have deleted it in the previous commit.