Revert c6e82b3..5a6c892

This rolls back to commit c6e82b3b2cc5070066631c7b4a1fc2ebe28f7e9c.