Revert "Removed -s from AbstractConsumables"

This reverts commit 55d6d14e72f331be9bfce6e657f89a510818a69c.
Revert "Revert "Removed -s from AbstractConsumables""

This reverts commit 8fed676959f5baa0b25aa34d3e83c4c02d04f0fa.
Revert "Revert "Revert "Removed -s from AbstractConsumables"""

This reverts commit 083aadefde9ae21623928b4d39c8904b49cd7377.