BUG Form session message clearing regression

Regression originally from 729bcc9, but made visible by 014f541

forms/Form.php

@@ -1319,15 +1319,15 @@ public function callfieldmethod($data) {
 	 * than <% control FormObject %>
 	 */
 	public function forTemplate() {
-		// Now that we're rendered, clear message
-		Session::clear("FormInfo.{$this->FormName()}.errors");
-		Session::clear("FormInfo.{$this->FormName()}.formError");
-		Session::clear("FormInfo.{$this->FormName()}.data");
-
-		return $this->renderWith(array_merge(
+		$return = $this->renderWith(array_merge(
 			(array)$this->getTemplate(),
 			array('Form')
 		));
+
+		// Now that we're rendered, clear message
+		$this->clearMessage();
+
+		return $return;
 	}
 
 	/**