Revert "Bug fix"

No bug here after all as indicated by some test runs.

Note that this suggests there is an error in equation (2) on page 6 of the SI
for Sjostrand et al. (2014).

This reverts commit 1fe3600d4f494bfcc17b2333a737136f0e9356ac.