This reverts commit f1818cb7ba, reversing changes made to 6c9362d61b. This broke things
f1818cb7ba
6c9362d61b