Revert 0bdde84..d28fa9a

This rolls back to commit 0bdde8426fa68f3a92bdb4be439dbf4916e443d1.