Revert 10a6065..33207de

This rolls back to commit 10a60656dd8fd50731f5c28d456c91786b90e7d4.