Revert 47f9695..f8db3f0

This rolls back to commit 47f9695618626519e08aa16e005f4056ad83aced.