Revert "Fixing security vulnerability reported by Francois Harvey (http://francoisharvey.ca/)"

This reverts commit d0778e5974d2cc010a165bdac9afe4d6ad0975d6.