Revert 4618a49..b205902

This rolls back to commit 4618a49077348435c120343c5dce660d342e2f9c.