Revert 4dda91c..2717609

This rolls back to commit 4dda91c2bcae41cae30e98f95170aaa8955969ea.