Revert ece7703..03d7d30

This rolls back to commit ece7703d19052f45471b967592a13bc7705652e3.