This reverts commit a223ba0a. The previous commit don't contain additional information, which is bad.