Apply @clevertension's trick to this repo as well