Revert 97e2739..833f197

This rolls back to commit 97e2739fab686b2e5f1cafb0cb5dac07d8dcb314.