Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
This reverts commit de14da95fa.
de14da95fa