Fixed issue #682: Rollback 78b127f