Revert "3.1.4.6 TONIC"

This reverts commit 81e4091b0f8c57efba2d49d2d760939ad2ad3a2e.