Fix per https://github.com/ajaxorg/cloud9/issues/2005
Continue https://github.com/ajaxorg/cloud9/issues/2005