Partially revert 80a1ab59.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>