This reverts commit 30443b31.

Turns out this causes other issues as reported by Adam.
Signed-off-by: NTony Lingren <tony@atomide.com>