Revert some convoluted code.