Reverted previous commit as was causing exceptions.