Revert back to 24b130281f804428f5b0ee3e3bce9e656c2478eb commit