Revert 5afc9c5..e6f5676

This rolls back to commit 5afc9c5c620b7801fa347aa078cddaa67fd46ea1.