upstream and resync fireplace to commonplace (bug 999703)