Revert 6bbf2d7..4db2bf0

This rolls back to commit 6bbf2d79eade6343929f4d20b21aeabc7ebfd8d9.
Update index.php
Resolve conflict