Revert af63a32..2034edf

This rolls back to commit af63a3259f608577749a325ff1718665bc96a0a8.