Rebase to a clean dlxb1u-ga7e3f3e source

Signed-off-by: zeroblade1984 <zeroblade1984@gmail.com>