Revert df320c3..eb40453

This rolls back to commit df320c39b18f45e3e776ab2e2509d264b5575e22.