Revert c52d4f3..daca51c

This rolls back to commit c52d4f3894110bc10a817d2483c162e72660cd0d.
111