Revert "Multiple fixes for stability"

This reverts commit ad56a8f7d106792b6e934828a4ae8bb9c3d51753.