Revert to e297d803bd6405e17909768acbbfb4d550734a65