Revert 2343c25..4cf5324

This rolls back to commit 2343c25e61bf4390b0ec19a80a6526c941ea6aa3.