Practically reverted previous changeset.