Revert 3ad4bfd..c9a07a3

This rolls back to commit 3ad4bfd8ab1ca62dc68469e3afdbb9309bc5b2c6.