[Commits] 03edf2e: Undo the incorrect part of commit 7e700bd2a81ae4b37145f1c32bb0902c72856d2d