Revert 8cb7748..b225304

This rolls back to commit 8cb774844301d0c23899307b1197fb41dc0bc4fb.