[Commits] 2308bd5fbe3: Rollback a change from previous commit