This reverts commit dd72ae3d. Notified the author of the internal failure and author suggested to revert it for now.