Revert 26a8b5e..8b17f1a

This rolls back to commit 26a8b5e91f665f258a6b5eb2311b57cecdb8e2f0.