Revert 29e4e50..3504470

This rolls back to commit 29e4e500c3b53cb79a1c653f822993fdebbf4360.