Backout commit 8f1bc284 as it causes TFTP to fail.