Revert ccba339..42defa5

This rolls back to commit ccba339dfe7938f3da3ab2646030a29b11fcd366.