This reverts commit 7b0f6378. As commented on the review, this patch has a correctness issue regarding the modelling of memory effects.