Removed now-unnecessary hiddenField() method, plus fix for the recent patch

Change-Id: Ic17327d3cfb5591264ff9a116640649292bcb471