Revert

This rolls back to commit 0d26f3716384a4f408c4cb95f4c4f1bc6186d35d.