Whether to make this change is still being debated, but this is a ticket
for the changes involved:

* Code change
* Documentation changes
* System test updates

		Mukund