Revert d856581..cd1ab8b

This rolls back to commit d856581b81066c3c3d8bc4333047b1cb98fd4251.