Revert Wide Guard changes

Revert the changes done to Wide Guard in commit 
b536d8615e938d7027864c46027af232c20550c2