Revert "Revert 2daa4d2..8f56b9e"

This reverts commit 23d7a90446e82ba54f7ca2325965c57fa3d68672, reversing
changes made to 60ca8be1f6d5b0f8e94d55a9927bdb02cffa7eaf.

Conflicts:
	index.php