Revert e221dd0..d53d532

This rolls back to commit e221dd0df18c0d55a2ef995801b879d706336fe9.