Revert fb39020..f0d7efc

This rolls back to commit fb39020175aec80340c9c9791d6c1b1c25295a7e.