Revert "Master of puppets"

This reverts commit 2c7c717e19a5ca29828e826d207f73d07e1b7448.

Conflicts:
	index.php