Revert 3e7b463..44052e0

This rolls back to commit 3e7b4637ad6ed8236d7277701cbb3bce1e8b9930.