Created by: rvantonder
This reverts commit 870eac29ac10280883558944e0c6a38237acbe5d.
Bad merge, will fix up tomorrow.
It's a revert