Revert unstable code