Revert "Resubmit for 2.1"

This reverts commit 5fb7067cef6b26c37ec92d8d477714de0557a6db.

Conflicts:
	includes/shortcodes.php