Comment out soledad temporarily. Closes #2932.
Merge remote-tracking branch 'ivan/bug/2932_comment-out-soledad' into develop