Reverted faulty optimization.