[#69] Reverting manually changes made in commit 0b2be57