Revert "Merge branch 'master' into fft"

This reverts commit ec05d8688b799c9c08edc1e9c7cc4881f86490f7, reversing
changes made to 63e4f54be5aaec71a1199700150c0951e769f6a5.