This diff seems unnecessary...  Should just revert this change.