Revert some stuff from previous commit
The problem with cut and paste(laziness).

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