Singularity Rollback

old singularity committed.