Removes pre-Juno generic hack