Revert 6fcc82b..b1391b4

This rolls back to commit 6fcc82b052fc3664cbc6ec649222bbc783f52928.