Revert "Revert "Revert 2f2385a..60a2de8""

This reverts commit c01bf32a74d6270dbc289a9e23c24c77461bff0b.

Conflicts:
	application/controllers/ajax.php
	application/controllers/r.php