calls to super actually make it worse, not better
Merge commit '9f91e211'