Revert 2adc06f..73a40e9

This rolls back to commit 2adc06fb093ca0437d0fcc1ed261eccd127ee129.