Revert r36916 for now ("(bug 14698) Make "Block account creation" work as advertised...