Revert to c3caadc97b324354abd24200c8d3fbc8dc9e5ae9