Rolled back the Detection portion

Signed-off-by: Benjamin <benchisa@gmail.com>