Editor: Reverting to simpler version.