Revert 70fdf9f..fc64094

This rolls back to commit 70fdf9f2d57eaa7ddab85bc1ebda939096d01a73.