Revert 74dc704..9125ba4

This rolls back to commit 74dc7044ee0a8444853b0028a77a42bbdf59a37b.