BROKEN: in-progress patch that currently fails