Revert 6d85155..1be4c4a

This rolls back to commit 6d85155958d4bc18dd25a43f83737f966464b214.