Revert db250bb..16b03f4

This rolls back to commit db250bb4f2f16724d2ff11b5398d7c67713f9b98.