Snapshot from geck-dev d2e992ad