Revert to ea52a89b
Tihomir added