Revert "Have not tested this change yet"

This reverts commit 05b362aaa2b087808c9c2dc5e1a43735992d9d99.