Revert 3acef76..98a7cd2

This rolls back to commit 3acef76095534b022195cde2734c7625a83778fc.