Revert 48f8cb0..6321dad

This rolls back to commit 48f8cb0df358684fb887af46d3c42f68cd0d351c.