Revert "Merge commit '2b28f184388e9fa7b7f9537158c348a61dad124e'"

This reverts commit 8e527b517623233cec08bd02ce6594536ea7aaf4, reversing
changes made to 26a9cbcbdd6a1590d2a14d99c3ddbd4c7833eec7.

Conflicts:
	override/classes/Carrier.php