Expression parser reverted