Revert 0c08a65..ba4ab19

This rolls back to commit 0c08a65b94f569f7621b6c0db8b3987c7e33e0a0.