Revert "- Rescaffolded with v1.0.24.0"

This reverts commit f3279a24143121c66f14bcc7d9d7da977488bb40.