Revert aquaterm patch of 24-Apr-2012