Revert r42037 "Improve hidden field checks for bug 1181"