Revert 662589d..7906c79

This rolls back to commit 662589d6183d7e29b676911f141e479f74ab36ad.
Security Bug Fixed