Revert 3affc91..43444db

This rolls back to commit 3affc9171d0d520dca95b1e2c7ae7a607005f0e7.