Revert to 46d2114b5718cfa4577654ca658e344edf597dae