Revert to subfig package, rather than subcaption