Revert efbb509..052fed3

This rolls back to commit efbb5096e1ee106c726e85f3a32e88759cffc3be.