Revert "Remove #980 temporary fix"

This reverts commit 28d482dbbbb8cb30721a7d5395340db64865f62b.
Revert 28d482d..a7fe24e

This rolls back to commit 28d482dbbbb8cb30721a7d5395340db64865f62b.