Revert 6ed8786..0c3a074

This rolls back to commit 6ed8786943443f5eea705fb42033d498d581338c.