Rollback on commit a95091e5ecaf70133bcbe77d4d95e392761f32b8
(Issue #1196)