3c5b2286a3
- this is a workaround until we get more thourough work done on the cost model - this is related to #955 and #989