Revert feced58..a6e5ebd

This rolls back to commit feced588ebe922102f1e9f86c861f76e47c2ee86.