Revert back changes to commit `6c19543d150c5905272d3c73e748e252574adb58`