Revert d96f079..8728209

This rolls back to commit d96f0795aa195466b91b10a28cc9be11d028c5e4.