Revert 238f8f7..1bd7083

This rolls back to commit 238f8f7ff66ccd1a02016aac40848e54be0a5199.
m