Revert fc20cd3..8d4803b

This rolls back to commit fc20cd3d0cc57c5c67e045b8510ea64a8d169101.