Revert 43e79ad..05e0d25

This rolls back to commit 43e79ade07d2aa967577e82b638077a74bcdab0b.