Remove some cruft which helps make #1047 not really happen