Revert fmap's currying change in f12af1ed0b8ef7115688cc6df7fe645a36f52532

A more permanent fix has now been introduced and the workaround is no
longer required.