#508: revert some changes