Remove Oneiric conditional logic

Change-Id: I6c39f3663281196f18b209ce5d3534a6ec85ea60
Merge "Remove Oneiric conditional logic"