Fix #1483: Remove some code that was needed for J!1.5