In the end I merged different version than I wanted. This reverts commit f25d21d2, reversing changes made to af884f56.