Issue 431/432 - Remove special handling for the $sitekey option