https://issues.jasig.org/browse/NETC-55