refs #735 - Reverting changes for not rpc rest projects