Revert abed231..cec0046

This rolls back to commit abed231bf43b8695ad5ad5f2db967b4f01d85dd3.