Revert Streamline userbouquet parsing coding