Revert "revert to working version"

This reverts commit 2c2a7726447406cb6dbdb725f010d63911469e65.