Revert f4c0d8f..7772b78

This rolls back to commit f4c0d8f080e51a50865c3a4ec944ce8229f5da2d.