Revert 9bd528e..919f8ed

This rolls back to commit 9bd528e78302ab294bd86b70d113c22813143461.