Revert to original code