Reverting change that may have caused crashing