Revert 2d8d4e1..94afaf9

This rolls back to commit 2d8d4e1e22be4ed8ced8d74f4b47b6ca5f105c0f.