Revert 0b155b8..bd97988

This rolls back to commit 0b155b8523c993292b50026f3b4740244c01c893.