revert changes for better performance and stability