Revert to v5.4.1