Revert 064e3da..6c87759

This rolls back to commit 064e3da706bb78f7bf04d799c205355ebffe27e3.