Re-did previous revert.
File now the same as commit bc55222