Revert 2cc6e06..ef26438

This rolls back to commit 2cc6e067b573ae4293433083632d5a0c9ef50135.
trying to figure out new crashing problem