Revert c572baa..9740a40

This rolls back to commit c572baae5e147447f1946300da8894def6837a4f.