revert changes #488