Fix the plugin-api commits for 1.6.4