Revert d39123e..b60cd15

This rolls back to commit d39123e02ba90178c4352992913ea6177e824c6c.