Revert 321eddb..bbca973

This rolls back to commit 321eddb55d6ab0e06199646804c5b6b0d2c83ecd.