revert changes from pull-482
update comments