Revert "Revert "a very bad change""

This reverts commit 69b782fcb5f1906a715d8f31bcde968c7d27393b.
Commit for A-team training