Revert 6d3a65f..d00e283

This rolls back to commit 6d3a65f38ffda6c44005258ebf79b603a167ddd2.