Revert 0347189..c3fe12f

This rolls back to commit 03471893144041fecdebea2dfb03728193b7b39c.