Revert to fb4603e7858b42bd3e26902faa36c75896dde965