Revert 6cf7d90..700e318

This rolls back to commit 6cf7d90b2f4accf0c6acfbc564569db335520733.