Revert "Commit #24.2"

This reverts commit 4a21c4e05e48ac30286d72b464c53a3969f1cec4.