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