Revert c498f82..ff07791

This rolls back to commit c498f824accf89e1d1a4a4210e7b6a3204c9096a.