Unaddressed review comments. This reverts commit b6bfb897. Signed-off-by: Tom Rini <trini@konsulko.com>