revert changes for production stabilit