Revised from default GitHub version.