Revert 2dfdd80..33b281f

This rolls back to commit 2dfdd8057b26d7db45ce28d54fb478339a320e39.