Revert to 499362d7db07100d625ea02c610317a7ec37afbd