Revert e30a55c..7f56225

This rolls back to commit e30a55cc3622abc0f07bfb98d0e768ec4db8aee5.