Android TV ADT-1 adb connect port changed?

I directly hooked it up to a laptop and manually forced it to use port 4321 again via: "adb tcpip 4321"

Now I can connect with my main dev computer from across the room again.

Grumpf. Look like they removed the necessary "service.adb.tcp.port=4321" from build.prop in 5.0.2.