Revert "got rid of special cases"

This reverts commit 823c0f56f8b79a529f26ae5f46e97b3705b79625.
bring back special case for 5 Tbsp