Sounds reasonable and simpler (a6e77187ef96035cde94c25241dfc2f7285cd0be).