Revert to bf1273c94f485307422b36cad105e92f50a7a6f9