Removed leftover change from before merge