Revert 1f578a0..1adb58d

This rolls back to commit 1f578a07ce1ff3eadce71832aa62dfbbfa106e85.