Revert back to second commit

This rolls back to commit 86f396d22f8305ce0215dd45afd345a45a9ffb96.