onyx 2018-12-06

@lucasbradstreet we gave it another shot with a new PR. Let us know if it works for you now.