Revert validatable fix