Remove the hook
Merge branch 'elgg1.8'

Conflicts:
	views/default/js/framework/wall/status.php