Revert b9faffa..834d708

This rolls back to commit b9faffa2e15e63ab1c1062bf979a096bc5a786f4.