Reverting back to previous good solution. Last commit was not intended.