[Issue #225] Revert commit "[Issue #109]