Revert 8f97920..6a0120c

This rolls back to commit 8f9792021e082935be616d1df78a9c8f85d3d752.