Revert c48ab02..eaf532e

This rolls back to commit c48ab022c5ef2e6fbe487e22331364748c2e8d4f.