Revert c36a254..f15b24d

This rolls back to commit c36a254fbf34b09e377b20d79fedfdf7386f71a3.