Revert 9dce9ce..02d2e57

This rolls back to commit 9dce9cec82795e6ea0f78ef4c735d12d9e0870b6.