Fixed issue in #1010, #1012

All is good now.

All in one commit.

No copyrighted content...

>insert slightly insane facial expression here
Revert "1"

This reverts commit 88c0815f3e887001c34c32e262da023756b57e4f.
THIS TIME