Revert to No Two-Way + New Jar