Revert "take that"

Conflicts:
	index.php