Removed the temp impl of conditionals, since it just wasn't good enough