Revert 5f0ee74..a586e02

This rolls back to commit 5f0ee744bc2d6bce711d3879d38e71321acd8094.