Revert de8946d..20eaddf

This rolls back to commit de8946dbb11368d951e2a8565ea334e365c7b13e.