Seems like this also breaks frozen tests... This reverts commit c7fdcc92b8.
c7fdcc92b8
This is cleaner even if pylint can't handle it.