Revert c3fd77e..a2d2982

This rolls back to commit c3fd77e824a0397261ecffb201c64ae94138bbaa.