Revert 29eebec..7270935

This rolls back to commit 29eebec0d4095ef0356a8c46339173fd46393c9d.