Rollback commit 5cae9d03ad179df45f5c0f9d8b5777543bf86205 completely.