Revert 79d59e4..c3cc30e

This rolls back to commit 79d59e47e4887740318cb12a8ff4fc30fc312022.