Revert 07a8999..6db51e4

This rolls back to commit 07a89991ac15c497a5ae72cd5a8c0d4206e90bd3.