Revert to 3dc16fce6bc237acab4f6dad0d8fda0bc9fa1452
After the local revert