Revert 65ba7f9..96413e0

This rolls back to commit 65ba7f93e26b24abeb886601899707a25db68c3c.