Revert "Closes #671. Pulling in @rjmackay's validation fixes."

This reverts commit def9e1da743654dda2097b71947c94c9dfe73119.