Some general cleaning and getting things in place to fix #3091

[antgonza]

First review/merge: #3163

[coveralls]

coverage: 91.08% (+0.001%) from 91.079%
when pulling a78712d on antgonza:fix-3091
into 16af20e on qiita-spots:dev.

[antgonza]

@wasade once the test pass, this should be ready to be reviewed; thank you. Note that this could solve #3091 but don't think is worth deploying as explained here but I think the general improvement and having the lines commented out is a good way forward; please let me know what you think.

[antgonza]

@wasade; could you review/merge when you get a second? Thank you.

[wasade]

I don't really understand the context and am not really familiar with the surrounding code. Given that, I don't see anything weird

[antgonza]

ha! yes, it has been almost 3 months since we worked on this but I guess that's good enough ... thank you, I'll merge it!